Roll JsonCpp This patch rolls JsonCpp to HEAD. Bug: 989851 Change-Id: I062f7d398190b61a66d48952b7504848ab1d75ca Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2433107 Reviewed-by: Takumi Fujimoto <takumif@chromium.org> Reviewed-by: Jordan Bayles <jophba@chromium.org> Commit-Queue: Jordan Bayles <jophba@chromium.org> Cr-Commit-Position: refs/heads/master@{#810999} GitOrigin-RevId: 592d07510836410a1ec4833de342544d1b39ef08 diff --git a/BUILD.gn b/BUILD.gn index af4a1f1..b51aa3a 100644 --- a/BUILD.gn +++ b/BUILD.gn
@@ -5,10 +5,7 @@ import("//testing/libfuzzer/fuzzer_test.gni") config("jsoncpp_config") { - include_dirs = [ - "source/include", - "generated", - ] + include_dirs = [ "source/include" ] # TODO(crbug.com/983223): Update JsonCpp BUILD.gn to remove deprecated # declaration flag. @@ -21,15 +18,15 @@ source_set("jsoncpp") { sources = [ - "generated/version.h", + "source/include/json/allocator.h", "source/include/json/assertions.h", - "source/include/json/autolink.h", "source/include/json/config.h", - "source/include/json/features.h", "source/include/json/forwards.h", "source/include/json/json.h", + "source/include/json/json_features.h", "source/include/json/reader.h", "source/include/json/value.h", + "source/include/json/version.h", "source/include/json/writer.h", "source/src/lib_json/json_reader.cpp", "source/src/lib_json/json_tool.h", diff --git a/README.chromium b/README.chromium index da90c30..dd36c6e 100644 --- a/README.chromium +++ b/README.chromium
@@ -1,7 +1,7 @@ Name: jsoncpp URL: https://github.com/open-source-parsers/jsoncpp -Version: 645250b6690785be60ab6780ce4b58698d884d11 -CPEPrefix: cpe:/a:jsoncpp_project:jsoncpp:1.9.1 +Version: 1.9.4 +CPEPrefix: cpe:/a:jsoncpp_project:jsoncpp:1.9.4 License: MIT License File: LICENSE Security Critical: yes @@ -11,7 +11,3 @@ project is mirrored here from the public GitHub project, with a custom BUILD.gn to allow for building with our Ninja + GN configuration. The main project uses Meson or CMake for building. - -Note: to update this project to a new version, regenerating the version.h header -is required. This can be done by installing either CMake or Meson, building the -project, and copying the generated version.h to the generated/ subfolder.
